Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 7 Nov 2005 14:06:27 +0000 (15:06 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 7 Nov 2005 14:06:27 +0000 (15:06 +0100)

Trivial merge